Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 25 Jun 2011 18:31:36 +0000 (11:31 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 25 Jun 2011 18:31:36 +0000 (11:31 -0700)
commit19f23648bff0e698c45c0fb2f15de4e038794cfe
tree9dba04382513eafbaaaefb4e35b2af34f259cae0
parent91c9504db4d8194ae4db36989a6d9ff25d6d79dc
parentb8a9fbcee52fcfab0ef08f22a703a336654f1beb
Merge from trunk.
src/ChangeLog